Add nvidia_aspeed_bmc marker#563
Merged
saiarcot895 merged 1 commit intosonic-net:masterfrom May 7, 2026
Merged
Conversation
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
oleksandrivantsiv
previously approved these changes
May 1, 2026
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
paulmenzel
suggested changes
May 1, 2026
Contributor
paulmenzel
left a comment
paulmenzel
left a comment
There was a problem hiding this comment.
In my opinion, the marker should be introduced, when the other changes depending on it get added. No separate merge/pull request is needed.
Additionally, it’d be really great, if you wrote a commit message body.
Contributor
Author
sure, let me fix it |
william8545
force-pushed
the
nvidia_bmc_marker
branch
from
9f43289 to
91bde9c
Compare
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
william8545
force-pushed
the
nvidia_bmc_marker
branch
from
91bde9c to
6924ead
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
william8545
force-pushed
the
nvidia_bmc_marker
branch
from
6924ead to
91bde9c
Compare
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
Introduce a `nvidia_aspeed_bmc` marker block in two locations:
* patches-sonic/series
* config.local/arm64/config.sonic-aspeed
The marker delimits a region that the NVIDIA/Mellanox hw-mgmt integration
scripts in sonic-buildimage own. The scripts use the markers to insert
BMC-only kernel patches and Kconfig fragments for ASPEED BMCs (e.g.
AST2700) without colliding with the existing `mellanox_hw_mgmt` block,
and to clean stale BMC content from previous integration runs.
The consumer of this marker is sonic-buildimage PR #27038
("Add ASPEED BMC support to hw-mgmt integration scripts"), which extends
platform/mellanox/integration-scripts/hwmgmt_kernel_patches.py to:
* Look up the `nvidia_aspeed_bmc` markers in patches-sonic/series via
`find_marker_indices` and rebuild the block from a BMC-only patch
list on every integration run.
* Remove old BMC patch files from patches-sonic/ that fall between the
markers, then copy the new BMC patches in.
* Apply BMC Kconfig fragments to config.local/arm64/config.sonic-aspeed
using the same marker pair.
The block is populated only when an hw-mgmt integration run produces
BMC content. The upstream hw-mgmt repository is at
https://github.com/Mellanox/hw-mgmt
Signed-off-by: William Tsai <willtsai@nvidia.com>
william8545
force-pushed
the
nvidia_bmc_marker
branch
from
91bde9c to
9e282ab
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
oleksandrivantsiv
approved these changes
May 5, 2026
yxieca
approved these changes
May 7, 2026
saiarcot895
reviewed
May 7, 2026
| 0001-Add-device-tree-for-Nokia-BMC-H6-128-platform.patch | ||
| ###-> aspeed-end | ||
|
|
||
| ###-> nvidia_aspeed_bmc-start |
Contributor
There was a problem hiding this comment.
Are there out-of-tree patches/configs being set?
Collaborator
There was a problem hiding this comment.
Yes, patches and config will be provided in a separate PR.
saiarcot895
approved these changes
May 7, 2026
Contributor
saiarcot895
left a comment
saiarcot895
left a comment
There was a problem hiding this comment.
Discussed with Nvidia, patches and config for the BMC will be updated by their automation in a separate PR.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds an empty
nvidia_aspeed_bmcmarker block to:patches-sonic/seriesconfig.local/arm64/config.sonic-aspeedThe block is the insertion point that the NVIDIA/Mellanox hw-mgmt integration scripts use to manage BMC-only kernel patches and Kconfig fragments for ASPEED BMCs (AST2700, etc.) separately from the existing
mellanox_hw_mgmtblock.Merge ordering
This PR needs to be merged before sonic-buildimage PR #27038.
PR #27038 ships the BMC-aware hw-mgmt integration script, which aborts with a
FATALerror if thenvidia_aspeed_bmcmarkers are not already present inpatches-sonic/series. Merging #27038 first would break sonic-buildimage builds that pick up the new submodule pointer.Why this is needed
The dependent change lives in sonic-buildimage PR #27038
("Add ASPEED BMC support to hw-mgmt integration scripts"). That PR teaches
platform/mellanox/integrationㄦscripts/hwmgmt_kernel_patches.pyto:nvidia_aspeed_bmcmarkers inpatches-sonic/series(find_bmc_markers/find_marker_indices).write_bmc_series_block), removing stale entries withrm_old_bmc_patches.config.local/arm64/config.sonic-aspeedbetween the same markers.The actual BMC patches and Kconfig fragments are produced by the upstream NVIDIA/Mellanox hw-mgmt repository:
Mellanox/hw-mgmt. The integration script in sonic-buildimage consumes a hw-mgmt release tarball, splits out the BMC-only content, and drops it between the markers added by this PR.
If the markers are missing the integration script aborts with:
So the markers must be present in sonic-linux-kernel before the sonic-buildimage submodule pointer can be bumped to a revision that runs the BMC-aware integration script.